From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 18 Apr 2013 16:49:01 +0000 (+0200)
Subject: Merge branch 'olsrd'
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=f9210484742e8e1010c4c17747ff1608418dc311;p=feed%2Frouting.git

Merge branch 'olsrd'
---

f9210484742e8e1010c4c17747ff1608418dc311